self.model_uni_names
共有 2 個文件被更改，包括 2 次插入 和 2 次删除
+ 1
- 1
mch/admin.py
@@ -186,7 +186,7 @@ class ConsumeInfoSubmitLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin): |
||
| 186 | 186 |
|
| 187 | 187 |
|
| 188 | 188 |
class ActivityInfoAdmin(admin.ModelAdmin): |
| 189 |
- list_display = ('activity_name', 'start_at', 'end_at', 'status', 'created_at', 'updated_at')
|
|
| 189 |
+ list_display = ('activity_name', 'model_uni_names', 'start_at', 'end_at', 'status', 'created_at', 'updated_at')
|
|
| 190 | 190 |
|
| 191 | 191 |
|
| 192 | 192 |
admin.site.register(AdministratorInfo, AdministratorInfoAdmin) |
+ 1
- 1
mch/models.py
@@ -543,4 +543,4 @@ class ActivityInfo(BaseModelMixin): |
||
| 543 | 543 |
return unicode(self.pk) |
| 544 | 544 |
|
| 545 | 545 |
def has_unexpired_activity(self, model_name): |
| 546 |
- return model_name in self.model_uni_names and self.start_at <= tc.utc_datetime() < self.end_at |
|
| 546 |
+ return (self.model_uni_names and model_name in self.model_uni_names) and (self.start_at <= tc.utc_datetime() < self.end_at) |